Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 28 Jun 2011 15:41:56 +0000 (08:41 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 28 Jun 2011 15:41:56 +0000 (08:41 -0700)
commit63fa0cb4c1f67ed5564fa6f79286ccd16ae1721c
tree172561dbaac101c90cf9ea67d12d81502442a6a9
parent360cf66f87b27d7a260b7cc823663877537ce26c
parent47d41034053ae0a8dad7069c0baec26a127a11bf
Merge from trunk.